removed more warnings about unused vars