Issue #7 removed unued modules from project