Cleaning up code

Removing code that was added for testing, or otherwise un-optimized.