removing even more stuff