Remove more things i don't like