Added patch to remove obsolete remoteentityid columns