undo unnecessary code