Some cleanup in config and entry-meta.php