Using method that already exists
Removing package that don't exists anymore
Minor refactor
Merge pull request #783 from caelum/ot-minorcodechanges

Refactor code to remove unnecessary code