Bunch of code
Revert "Bunch of code"

This reverts commit 158e9700b15ed3a8806db3f77a40b9c359b1f015.