cleanup around location