Remove dual x-carriage functionality that could/should be implemented in slicer

Also added a couple of missed merge lines in homeaxis() from previous
commit.