Change aasm workflow to include removal