Remove default entities, update configuration