CORE-4640:
* Cleaning out unnecessary method calls and files.