Remove even more stuff