Removing old code and updating