Cleaned up database