removed unneeded t/etc
v0.30