Remove legacy instance variables and synthesize