Revert "Cleanup"

This reverts commit 4568aaf8013fcc9a8ca0dc35125d8a261ae654bd.