shadowing: api, cleanup.