Revert "General: Added all of the code"

This reverts commit 222b4900677f0bfe9b0bb139abf3bbfde0ea7083.