More cleanup, removing unused variable