cs fix
cleanup some unused vars
v0.4.25