Broadway: Cleanups