Update Manifest and remove clutter