Cleanup
Commented code cleanup