small refactory
Delete feature
small fix