Remove things properly and fix a few commit bugs.