Code Cleanup and update to Forge 828