Cleanup redundant qualifiers and code in common
Cleanup redundant qualifiers and code in cluster