cleanup of unneeded vars