Merge "Remove false dependencies"