Is anything here able to be deprecated or put into a different heading?