commouse: some cleanup