Cleanups pt. 5