Adding spike removal again.