Removing unnecessary code

> And related tests