cleanup and removing things we don't need anymore
397. close enough.