Code cleanup, forge update and biome id fix