Changes for alignment based removal