Remove and reassign done, needs cleaning up