removing some legacy code refactoring the create on enter