Revert "Clean-up"

This reverts commit a6a888be32720e62d76286a8b23c4968d1b39ff7.