Removed / refactored various core locations