remove feature spec and add nil handling