Cleanup and updated to Forge .660+