Commit after spring cleaning.