Remove @synthesize and local function definitions