Removed some more bloat.