Drop some things that I wasn't using and cleanup.