[resolves #184] Clean up module dependencies