Removed more commented out code & functions