Deleted a bunch of bloat