Take out the trash

More cleanup