Cleaned up code

Removed commented code from files