removing a bunch more stuff