Code cleanup of unused variables