some cleanup 2