Ditched unneeded stuff