Remove unused variables
Remove support for compiling with -DFASTEST