Remove hardcoded DB references