remove left over module references
finish refactoring this sucker, fail on failed command