Removed code that is not needed