Removing ablilty to define database_name/application at machine level.