Updated to latest Forge, Cleanup