start on some cleanup