commented out code removed