Code cleaning

* Dropped unused module calls