Cleaning up defines for database implementations