Cleanup, renaming, deleting and final commit