Make clear remove and insert does NOT work with attribute matching

See https://cakephp.lighthouseapp.com/projects/42648/tickets/4011-hashremove-with-regex-fails-to-remove