style
removed test code
moved OPTIONSFILE to be defined by Makefile