Removing deprecated code and updating config reader