Cleared some unused variables