CLEAN UP:
remove commented out code