workaround for Bootstrap bug; fix module dependencies

and some clean-up

Change-Id: I41b69fb2a38e2cbcc25630faf1408797c20c0a06