Merge "Fix API review comments, add remove callback." into nyc-dev