clean unmix declarations and code

Signed-off-by: Andy Green <andy.green@linaro.org>