Removed unnecessary interdependency of modules