Revert "Cleanup"

This reverts commit f4d415ab6116693fef48f5b9365951ca3eec7a3a.