CLean not needed entity....rename some fields in entities to avoid
reserved keywords.