Added removeMouse to service and tool
Merged localchanges with master