Fix interface, and do come cleanup in the cstub