Fix assignment IDs being assigned incorrectly
Remove dead code...