layer: clean up API
6 files changed