Removed unused modules

Resolved https://github.com/enb-make/enb/issues/88 & https://github.com/enb-make/enb/issues/87