Unneeded bloat per discussion