Revert "Some clean up"

This reverts commit 32d79c395d085019fb12cc071a9951bf1664c1aa.