[Evgeny, Jason] refactoring Drop facet