got rid of uneeded vars