removing TODO and raw RuntimeException