Removed code that is not going to be used