Adding remove for tracking purposes