Cleaned out unused variables