cancel modal fix; cleanup