Cleanups pt. 3