clean redundant definiions