diff --git a/packages/babel-code-frame/src/index.js b/packages/babel-code-frame/src/index.js
index a42a5f3229..f7b0f10098 100644
--- a/packages/babel-code-frame/src/index.js
+++ b/packages/babel-code-frame/src/index.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint indent: 0 */
 /* eslint max-len: 0 */
 
diff --git a/packages/babel-core/src/helpers/merge.js b/packages/babel-core/src/helpers/merge.js
index 962f255926..8d3b4e7f63 100644
--- a/packages/babel-core/src/helpers/merge.js
+++ b/packages/babel-core/src/helpers/merge.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import merge from "lodash/object/merge";
 
 export default function (dest?: Object, src?: Object): ?Object {
diff --git a/packages/babel-core/src/helpers/normalize-ast.js b/packages/babel-core/src/helpers/normalize-ast.js
index cd8881a9fd..d2c91cef91 100644
--- a/packages/babel-core/src/helpers/normalize-ast.js
+++ b/packages/babel-core/src/helpers/normalize-ast.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "babel-types";
 
 /**
diff --git a/packages/babel-core/src/transformation/file/options/index.js b/packages/babel-core/src/transformation/file/options/index.js
index 521f8193e9..69792cc65e 100644
--- a/packages/babel-core/src/transformation/file/options/index.js
+++ b/packages/babel-core/src/transformation/file/options/index.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as parsers from "./parsers";
 import config from "./config";
 
diff --git a/packages/babel-core/src/transformation/file/options/parsers.js b/packages/babel-core/src/transformation/file/options/parsers.js
index 840c6e5f6c..fa8dbae260 100644
--- a/packages/babel-core/src/transformation/file/options/parsers.js
+++ b/packages/babel-core/src/transformation/file/options/parsers.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import slash from "slash";
 import * as util from "../../../util";
 
diff --git a/packages/babel-core/src/transformation/internal-plugins/block-hoist.js b/packages/babel-core/src/transformation/internal-plugins/block-hoist.js
index a0b5fab150..014b9e7711 100644
--- a/packages/babel-core/src/transformation/internal-plugins/block-hoist.js
+++ b/packages/babel-core/src/transformation/internal-plugins/block-hoist.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import Plugin from "../plugin";
 import sortBy from "lodash/collection/sortBy";
 
diff --git a/packages/babel-core/src/transformation/pipeline.js b/packages/babel-core/src/transformation/pipeline.js
index cbaf7fc32b..c32eed42d1 100644
--- a/packages/babel-core/src/transformation/pipeline.js
+++ b/packages/babel-core/src/transformation/pipeline.js
@@ -1,7 +1,3 @@
-/* @flow */
-/* global BabelFileResult */
-/* global BabelFileMetadata */
-
 import normalizeAst from "../helpers/normalize-ast";
 import Plugin from "./plugin";
 import File from "./file";
diff --git a/packages/babel-core/src/util.js b/packages/babel-core/src/util.js
index 8c1c1b1d80..d19fd40261 100644
--- a/packages/babel-core/src/util.js
+++ b/packages/babel-core/src/util.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import escapeRegExp from "lodash/string/escapeRegExp";
 import startsWith from "lodash/string/startsWith";
 import isBoolean from "lodash/lang/isBoolean";
diff --git a/packages/babel-generator/src/buffer.js b/packages/babel-generator/src/buffer.js
index af8f91ac01..1d31e4faef 100644
--- a/packages/babel-generator/src/buffer.js
+++ b/packages/babel-generator/src/buffer.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import type Position from "./position";
 import repeating from "repeating";
 import trimRight from "trim-right";
diff --git a/packages/babel-generator/src/generators/base.js b/packages/babel-generator/src/generators/base.js
index 9868dfe7f5..7245718cf2 100644
--- a/packages/babel-generator/src/generators/base.js
+++ b/packages/babel-generator/src/generators/base.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 export function File(node: Object) {
   this.print(node.program, node);
 }
diff --git a/packages/babel-generator/src/generators/classes.js b/packages/babel-generator/src/generators/classes.js
index c1bb4cf0f3..e6c499186c 100644
--- a/packages/babel-generator/src/generators/classes.js
+++ b/packages/babel-generator/src/generators/classes.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 export function ClassDeclaration(node: Object) {
   this.printJoin(node.decorators, node, { separator: "" });
   this.push("class");
diff --git a/packages/babel-generator/src/generators/expressions.js b/packages/babel-generator/src/generators/expressions.js
index 1f302a4342..d3062e3de9 100644
--- a/packages/babel-generator/src/generators/expressions.js
+++ b/packages/babel-generator/src/generators/expressions.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 import isInteger from "is-integer";
diff --git a/packages/babel-generator/src/generators/flow.js b/packages/babel-generator/src/generators/flow.js
index 07562c17b1..d886840e27 100644
--- a/packages/babel-generator/src/generators/flow.js
+++ b/packages/babel-generator/src/generators/flow.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 import * as t from "babel-types";
diff --git a/packages/babel-generator/src/generators/jsx.js b/packages/babel-generator/src/generators/jsx.js
index 310a26209f..7a926bb512 100644
--- a/packages/babel-generator/src/generators/jsx.js
+++ b/packages/babel-generator/src/generators/jsx.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 export function JSXAttribute(node: Object) {
   this.print(node.name, node);
   if (node.value) {
diff --git a/packages/babel-generator/src/generators/methods.js b/packages/babel-generator/src/generators/methods.js
index b72760055e..76552736e4 100644
--- a/packages/babel-generator/src/generators/methods.js
+++ b/packages/babel-generator/src/generators/methods.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "babel-types";
 
 export function _params(node: Object) {
diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js
index 87aace643f..31b54da80d 100644
--- a/packages/babel-generator/src/generators/modules.js
+++ b/packages/babel-generator/src/generators/modules.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "babel-types";
 
 export function ImportSpecifier(node: Object) {
diff --git a/packages/babel-generator/src/generators/template-literals.js b/packages/babel-generator/src/generators/template-literals.js
index 6b815a0a57..2b817284ae 100644
--- a/packages/babel-generator/src/generators/template-literals.js
+++ b/packages/babel-generator/src/generators/template-literals.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 export function TaggedTemplateExpression(node: Object) {
   this.print(node.tag, node);
   this.print(node.quasi, node);
diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js
index 5c40209172..aed1c3f35c 100644
--- a/packages/babel-generator/src/generators/types.js
+++ b/packages/babel-generator/src/generators/types.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 /* eslint quotes: 0 */
 
diff --git a/packages/babel-generator/src/node/parentheses.js b/packages/babel-generator/src/node/parentheses.js
index 0c2bba3c5a..29b0d1448d 100644
--- a/packages/babel-generator/src/node/parentheses.js
+++ b/packages/babel-generator/src/node/parentheses.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "babel-types";
 
 const PRECEDENCE = {
diff --git a/packages/babel-generator/src/position.js b/packages/babel-generator/src/position.js
index c653792ba7..de03687185 100644
--- a/packages/babel-generator/src/position.js
+++ b/packages/babel-generator/src/position.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 /**
  * Track current position in code generation.
  */
diff --git a/packages/babel-helper-regex/src/index.js b/packages/babel-helper-regex/src/index.js
index 6077c3a2b5..afe76e5c43 100644
--- a/packages/babel-helper-regex/src/index.js
+++ b/packages/babel-helper-regex/src/index.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import pull from "lodash/array/pull";
 import * as t from "babel-types";
 
diff --git a/packages/babel-messages/src/index.js b/packages/babel-messages/src/index.js
index 4f33f6a250..3fce2e2cf2 100644
--- a/packages/babel-messages/src/index.js
+++ b/packages/babel-messages/src/index.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 import * as util from "util";
diff --git a/packages/babel-register/src/node.js b/packages/babel-register/src/node.js
index da9a08e87c..4d9dfd378c 100644
--- a/packages/babel-register/src/node.js
+++ b/packages/babel-register/src/node.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import deepClone from "lodash/lang/cloneDeep";
 import sourceMapSupport from "source-map-support";
 import * as registerCache from "./cache";
diff --git a/packages/babel-types/src/definitions/core.js b/packages/babel-types/src/definitions/core.js
index 9eb9d7df43..74c29b7cfc 100644
--- a/packages/babel-types/src/definitions/core.js
+++ b/packages/babel-types/src/definitions/core.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 import * as t from "../index";
diff --git a/packages/babel-types/src/definitions/es2015.js b/packages/babel-types/src/definitions/es2015.js
index 60916e5e77..87512202d4 100644
--- a/packages/babel-types/src/definitions/es2015.js
+++ b/packages/babel-types/src/definitions/es2015.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 import defineType, {
diff --git a/packages/babel-types/src/definitions/experimental.js b/packages/babel-types/src/definitions/experimental.js
index eb85a19fc1..cf4667d8d5 100644
--- a/packages/babel-types/src/definitions/experimental.js
+++ b/packages/babel-types/src/definitions/experimental.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import defineType, { assertNodeType } from "./index";
 
 defineType("AwaitExpression", {
diff --git a/packages/babel-types/src/definitions/flow.js b/packages/babel-types/src/definitions/flow.js
index 1e87ac165f..d01da22505 100644
--- a/packages/babel-types/src/definitions/flow.js
+++ b/packages/babel-types/src/definitions/flow.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import defineType from "./index";
 
 defineType("AnyTypeAnnotation", {
diff --git a/packages/babel-types/src/definitions/jsx.js b/packages/babel-types/src/definitions/jsx.js
index 9e724179dd..a74b098a38 100644
--- a/packages/babel-types/src/definitions/jsx.js
+++ b/packages/babel-types/src/definitions/jsx.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import defineType, { assertNodeType, assertValueType, chain, assertEach } from "./index";
 
 defineType("JSXAttribute", {
diff --git a/packages/babel-types/src/definitions/misc.js b/packages/babel-types/src/definitions/misc.js
index 23e010da14..f063e42156 100644
--- a/packages/babel-types/src/definitions/misc.js
+++ b/packages/babel-types/src/definitions/misc.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import defineType, { assertNodeType } from "./index";
 
 defineType("Noop", {
diff --git a/packages/babel-types/src/flow.js b/packages/babel-types/src/flow.js
index 531471f2d8..b2dbd43dbc 100644
--- a/packages/babel-types/src/flow.js
+++ b/packages/babel-types/src/flow.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "./index";
 
 /**
diff --git a/packages/babel-types/src/index.js b/packages/babel-types/src/index.js
index c0abb139f0..e3c7f578ee 100644
--- a/packages/babel-types/src/index.js
+++ b/packages/babel-types/src/index.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import toFastProperties from "to-fast-properties";
 import compact from "lodash/array/compact";
 import loClone from "lodash/lang/clone";
diff --git a/packages/babel-types/src/react.js b/packages/babel-types/src/react.js
index 8ec3f457b1..9b665d224d 100644
--- a/packages/babel-types/src/react.js
+++ b/packages/babel-types/src/react.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "./index";
 
 export let isReactComponent = t.buildMatchMemberExpression("React.Component");
diff --git a/packages/babel-types/src/retrievers.js b/packages/babel-types/src/retrievers.js
index 36eac28625..12bba815b0 100644
--- a/packages/babel-types/src/retrievers.js
+++ b/packages/babel-types/src/retrievers.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as t from "./index";
 
 /**
diff --git a/packages/babel-types/src/validators.js b/packages/babel-types/src/validators.js
index 4e57b2d656..678b318c80 100644
--- a/packages/babel-types/src/validators.js
+++ b/packages/babel-types/src/validators.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint indent: 0 */
 
 import { getBindingIdentifiers } from "./retrievers";
diff --git a/packages/babylon/src/options.js b/packages/babylon/src/options.js
index 1456be6360..9da58e93b5 100755
--- a/packages/babylon/src/options.js
+++ b/packages/babylon/src/options.js
@@ -1,4 +1,3 @@
-/* @flow */
 // A second optional argument can be given to further configure
 // the parser process. These options are recognized:
 
diff --git a/packages/babylon/src/parser/comments.js b/packages/babylon/src/parser/comments.js
index 9fabbed737..c98b0460a9 100644
--- a/packages/babylon/src/parser/comments.js
+++ b/packages/babylon/src/parser/comments.js
@@ -1,4 +1,3 @@
-/* @flow */
 /* eslint max-len: 0 */
 
 /**
diff --git a/packages/babylon/src/parser/index.js b/packages/babylon/src/parser/index.js
index bc034e0549..3db3c56984 100644
--- a/packages/babylon/src/parser/index.js
+++ b/packages/babylon/src/parser/index.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import { reservedWords } from "../util/identifier";
 import { getOptions } from "../options";
 import Tokenizer from "../tokenizer";
diff --git a/packages/babylon/src/parser/util.js b/packages/babylon/src/parser/util.js
index 03ca0b2e57..c8cdeda9f1 100644
--- a/packages/babylon/src/parser/util.js
+++ b/packages/babylon/src/parser/util.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 import { types as tt } from "../tokenizer/types";
 import Parser from "./index";
 import { lineBreak } from "../util/whitespace";
diff --git a/packages/babylon/src/tokenizer/context.js b/packages/babylon/src/tokenizer/context.js
index bd35e67860..600b11403c 100644
--- a/packages/babylon/src/tokenizer/context.js
+++ b/packages/babylon/src/tokenizer/context.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 // The algorithm used to determine whether a regexp can appear at a
 // given point in the program is loosely based on sweet.js' approach.
 // See https://github.com/mozilla/sweet.js/wiki/design
diff --git a/packages/babylon/src/util/whitespace.js b/packages/babylon/src/util/whitespace.js
index 50b90c8ca7..e345a4cf5e 100644
--- a/packages/babylon/src/util/whitespace.js
+++ b/packages/babylon/src/util/whitespace.js
@@ -1,5 +1,3 @@
-/* @flow */
-
 // Matches a whole line break (where CRLF is considered a single
 // line break). Used to count lines.