Mass removal of build methods & map refactoring