Removed all unused methods and commented out code. Revert from here if something is broken.