Revert "Clean up"

This reverts commit a16486f37cd76b5bb82cbf4efed93bce4210b0e7.