Cleanup, update Manifest