Cleanup.

Removing old code & comments.