some cleanup in preparation for more changes