Code Refactor

Took out unnecessary methods and code