some cleanup, collections