Removed code that is no longer necessary