Add before save hook and remove ac-*