Commit before spring cleaning.