removed some debug helpers