Cleanup, removed unused variables