diff --git a/src/Flux.jl b/src/Flux.jl
index 5f7bbdfe..6cb92c50 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -7,25 +7,27 @@ module Flux
 using Juno, Requires, Reexport
 using MacroTools: @forward
 
+export Chain, Dense, RNN, LSTM, GRU, Conv,
+       Dropout, LayerNorm, BatchNorm,
+       params, mapleaves, cpu, gpu
+
 @reexport using NNlib
 using NNlib: @fix
 
 include("tracker/Tracker.jl")
 using .Tracker
 using .Tracker: data
-export TrackedArray, TrackedVector, TrackedMatrix, param, back!
+export TrackedArray, TrackedVector, TrackedMatrix, param
 
 include("optimise/Optimise.jl")
 using .Optimise
 using .Optimise: @epochs
-export train!,
-       SGD, ADAM, Momentum, Nesterov,
+export SGD, ADAM, AdaMax, Momentum, Nesterov,
        RMSProp, ADAGrad, ADADelta, AMSGrad
 
 include("utils.jl")
 include("onehot.jl")
 include("treelike.jl")
-export params, mapleaves, cpu, gpu, onehot, batch, glorot_normal, glorot_uniform
 
 include("layers/stateless.jl")
 include("layers/basic.jl")
@@ -33,9 +35,6 @@ include("layers/conv.jl")
 include("layers/recurrent.jl")
 include("layers/normalise.jl")
 
-export Chain, Dense, RNN, LSTM, GRU, Conv2D,
-       Dropout, LayerNorm, BatchNorm
-
 include("data/Data.jl")
 
 @require CuArrays include("cuda/cuda.jl")