removed code that should not be there