removed a few useless variables