Undo a few changes, remove unused methods.