cleaned up unused var's