Preparing to implement remove
Adding remove address function