comments/stubbs/cleanups