Now cleaning some things up