removing circular dependencies, overrides, hash and timestamp