started cleanup for compiler conditionals