Removing Excess/Obsolete Files Part 2

(Doing this in parts in case the game is broken...seems to work fine so
far, but let me know if you encounter anything missing or new bugs)

(Will leave it at this so we have some time to see if anything was
removed that shouldn't have been. Saved all removed files)

(Tried to fix some bugs I saw that weren't there when I uploaded the
past changes, some were a result of the merge)