got rid of commented code