Removed bloat; fixes.