getting rid of the crap Iain added for demoing some stuff