Merge "Clean up unused subprojects and configurations"