Revert "Clean up"

This reverts commit faf2d285df11fe767615dc922e1f476554d439b7.