Clean up and updated to forge 10.12.1.1082