Remove machinist2 syntax from master branch

machinist2 branch is the machinist2 compatible one.