Removed unused modules

Resolved #3