Cleanups pt. 6