bit o' cleanup