Cleaned up the garbage

Cleanlyness