Removed unused code

Some things remained commented out, also grammatical fixes.