Update more projects and remove some unused

Change-Id: I620fbd1031afaf5562010795ada6caad6671b871