Refactoring out deprecated code
Fixing nav steps