Cleaning up code, removing old code