Doing some cleanup and merging some stuff