Revert "house keeping"

This reverts commit a9bc12fd6e30b70786f432a3e6ca0cfb380a5f3a.