cleanup & consistency passthrough