More stuff
Revert "More stuff"

This reverts commit cd4aa5f191680e86c77faed79fc0fb10c754f25a.
Clean up