Cleanup redundant qualifiers and code in cluster