Align and remove invalid disk option