bunch o' cleanup