Removing old code not being used