Revert "Fix error(s)"

This reverts commit 9ce3f3a4fa4878f0fbc3204a47a43c9169984011.
Revert "Fix error(s)"

This reverts commit 86730a6b972ed618330def0b1ed465ddec039eb5.
Revert "Clean up"

This reverts commit db14b16bad63603e4b2243a6aca21a43ac971339.