Removed some commented code. (#554)