Clean up bigswitch bugs