Cleanup - remove extraneous commented code