removed code that caused breakage