remove crosswalk fix