callbacks module api cleanup