pin delegate fix, cleanup