Removed unused code.
Cosmetic code changes (AAA!)