Some cleaning up
Revert "Some cleaning up"

This reverts commit 98d86017396465c3ac4d2fb576e144691f774ecc.
Some cleaning up