some cleanup of the My<Type>Entity classes