Removed large chunks of disabled code.

Also added a few line breaks for readability.