Cleanup some commented code..