removed a few var names that do anything anymore