commit before cleaning up/removing methods