Cleanups pt. 8