Cleanup, removed unneeded variables