Cleanup of toggle