File clean up from major refactor