removed some thrash