Revert "Cleanup"

This reverts commit fb1c984e3466dc792437574a936dbac24b84cfd3.