Cleanup redundant qualifiers and code in common