Clean up comments and removed commented code.