removed unused var warnings