some sandbox cleanups