Work in progress
Revert "Work in progress"

This reverts commit ec6cbeee1f7a98534496ca0907e467e6cfb4618d.
clean