Cleaned Up Code

Removed old unnecessary code