Removed some thrash