Started initial cleanup of location page