Slowly cleaning up and removing unnecessary code