Allow conditions to be removed. Also removed unnecessary remove condition code