Cleaned up metadata