Revert "Massive code incoming"

This reverts commit bdf3da29ce5370e893cb917a40413c104218e33e.