version update and removed unused vars