Revert "Clearing"

This reverts commit ddfc7eb24a49e944b41bc70890de35e5ce44c760.