Remove deprecated code, refactor tariffs page