cleanup. I'm sure there's more I can get rid of but I'll do it later.