Cleaned up/updated manifest