cleanup unused, unneeded variables