Cleaned up database entries