removed code that was no longer necessary