removing some more stuff