Unregister some unused submodules

Change-Id: If53fc145fa4efcc6fa7ce3076c43952760c9fdb6