more clean up of mouse interactions