Manual: clean up some things related to the inclusion of the remotes. For button...