removing obsolete code
fixed tests after refactor and built latest