Clean up

Got rid of a few things