Added option to remove problem spots