Revert "Simple cleanup"

This reverts commit d2de7a3dec892b94967ee18fbc584ffa5dbb7129.
Undo

Undo