Revert "Cleaning up"

This reverts commit fb492b53a31509e560450ca775d7ad050eac66c1.