(retrolaunch) cleanups pt. 2