Preparing for attribute code duplication clean up