Clean Up and fix JRebirth 8 usage