Code cleanup - removing commented out code, printlns, etc