Update to latest Forge, Cleanup