Move attribute removal to validityAPI