Revert Constants wth TODO app config #94