Adapt for removal of conditions