Clean Up

Removed some not needed stuff.