Remove spurious test and variables