Updated code and docs
Remove useless uses