Shifted some more bloat. Caught some libs that belong to the extra bloat