improve log and remove depracted entities
improve save entity logic