Remove old code and commit errors #22