Revert "removing more unused stuff"

This reverts commit bb17194424710485863fd875b6ad3e91ac4739c6.