Cleanup, and add empty processing functions