remove some cm packages and bump version

Change-Id: I6ea08eaa1a58c6964a6f4af3fde22c255c2ef04b