More docs + Remove dead code