Removed more
Added the stuff I'm actually using