Revert "some cleanup"

This reverts commit 63f0d3f5e35023b88e887d9b3e9f8b0e436d1aab.
some correct cleanup