Minor changes to remove redundant steps