Clean up old code

Remove all commented out code.