Make axis checking a little more strict and remove two unused variables as spotted by Eric. Verified with OTW tests.