Fixes issue #43 Remove unused modules