Removed non-deterministic constructs from impl level