Made remove more user friendly.