Revert "Cleaning up"

This reverts commit e2eaa5ad325dd91929167383ff4077d9fdb4262d.