Trim some bloat