Ditched some of the sketchier things...