removing unnecessary variables, clean up