Some cleanup on mouse/touch areas