Cleaned up manifest