clean up. removed 2 unnecessary vars from my last commit