clean up code, delete old commented out code