removed unused var's