Cleaning up old, unnecessary code