Cleaned unused variables