Removed hard-coded configuration items