Removed the condition deletion and moved some of the functions to be standalone

Signed-off-by: license2e <ilya@shindyapin.com>
Merge branch 'master' of https://github.com/facet/core