remove unsecured config files, move logic to base class. remove underscore