Clean up code, update IC2 and Mekanism APIs