Removed more unneeded bloat.