and move the error reporting where it belongs
remove few tests for variables that never existed (merge error)