Add removeName function. Needs testing.