removed code that did not allow compile, had conflict with other files