Updated core to 7.24, cleanup