Removed unnecessary COM references