CLOUDIFY-2504 added constant and remove method