[INTERNAL,DOC] cleanups