Code cleanup (removed unused, commented-out code).