Removed Old Database Refs