Revert "more clean, wip!"

This reverts commit 8ca83adadb8ae2340bb8cfa5222bf9453cdc4e9b.