Revert "Update to latest Forge"

This reverts commit e88c3e6cdf67c12ee7ce11101f669544a81055d0.
Cleanup