Removed the obnoxious hardcoded database entries, now depreciated