MODULE_ constants eliminated