removed code that's breaking stuff