CLEANUP:
Removed commented out code