Cleanups pt. 2