API doc, cleanup methods