Clean code

Cleaned up code
Removed useless code