Remove dead code
Check class elaboration
Remove note (TODO is done)