fixed remove fuction