Some mouse code eliminated