Removes unused case converter + Todo + naming things