Clean up Mixture's mess

Signed-off-by: Thomas Sturge <tomsturge@googlemail.com>