Cleaned up metadata modules.