delete stuff
a lot of changes