remove even more stuff