Fix todos in old cs java class